gtk/gtkclist.[ch] gtk/gtkctree.[ch] gtk/gtkitemfactory.[ch]

2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.[ch]
	* gtk/gtkctree.[ch]
	* gtk/gtkitemfactory.[ch]
	* gtk/gtkobject.[ch]
	* gtk/gtksignal.[ch]: s/GtkDestroyNotify/GDestroyNotify/g

svn path=/trunk/; revision=20967

diff --git a/ChangeLog b/ChangeLog
index a297aa195487f1453a92d3eaf29578f1b10bbb7a..13e88717d1828c85d2bb8a3177e1bbebe25dbe41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkclist.[ch]
+       * gtk/gtkctree.[ch]
+       * gtk/gtkitemfactory.[ch]
+       * gtk/gtkobject.[ch]
+       * gtk/gtksignal.[ch]: s/GtkDestroyNotify/GDestroyNotify/g
+
 2008-08-04  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtklinkbutton.c (gtk_link_button_set_uri): update the link

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 4c23fc351b52acdaf8789676d4872735e7f99382..2d9eb1cfe8dd873bcceb0f3c0681fc58661aa617 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3071,10 +3071,10 @@ gtk_clist_set_row_data (GtkCList *clist,
 }
 
 void
-gtk_clist_set_row_data_full (GtkCList         *clist,
-                            gint              row,
-                            gpointer          data,
-                            GtkDestroyNotify  destroy)
+gtk_clist_set_row_data_full (GtkCList       *clist,
+                            gint            row,
+                            gpointer        data,
+                            GDestroyNotify  destroy)
 {
   GtkCListRow *clist_row;
 

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 06cbf66ef9068a90e6cba8c9c3f49925885719e8..40a594d061b7b1b05af8c0afc5111ff1296d201c 100644 (file)
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -352,7 +352,7 @@ struct _GtkCListRow
   GtkStyle *style;
 
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
   
   guint fg_set     : 1;
   guint bg_set     : 1;
@@ -699,10 +699,10 @@ void gtk_clist_set_row_data (GtkCList *clist,
                             gpointer  data);
 
 /* sets a data pointer for a given row with destroy notification */
-void gtk_clist_set_row_data_full (GtkCList         *clist,
-                                 gint              row,
-                                 gpointer          data,
-                                 GtkDestroyNotify  destroy);
+void gtk_clist_set_row_data_full (GtkCList       *clist,
+                                 gint            row,
+                                 gpointer        data,
+                                 GDestroyNotify  destroy);
 
 /* returns the data set for a row */
 gpointer gtk_clist_get_row_data (GtkCList *clist,

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 3d1c105a4b18d4b4fab95fc257084b5950046fc1..f95b3db0f26f4788cd1cfe85794d1019aeb5fdbc 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -3267,7 +3267,7 @@ row_delete (GtkCTree    *ctree,
 
   if (ctree_row->row.destroy)
     {
-      GtkDestroyNotify dnotify = ctree_row->row.destroy;
+      GDestroyNotify dnotify = ctree_row->row.destroy;
       gpointer ddata = ctree_row->row.data;
 
       ctree_row->row.destroy = NULL;
@@ -5131,12 +5131,12 @@ gtk_ctree_node_set_row_data (GtkCTree     *ctree,
 }
 
 void
-gtk_ctree_node_set_row_data_full (GtkCTree         *ctree,
-                                 GtkCTreeNode     *node,
-                                 gpointer          data,
-                                 GtkDestroyNotify  destroy)
+gtk_ctree_node_set_row_data_full (GtkCTree       *ctree,
+                                 GtkCTreeNode   *node,
+                                 gpointer        data,
+                                 GDestroyNotify  destroy)
 {
-  GtkDestroyNotify dnotify;
+  GDestroyNotify dnotify;
   gpointer ddata;
   
   g_return_if_fail (GTK_IS_CTREE (ctree));

diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index e9cabffa7c8005cf10768b0fb559e867b7fa096d..4e1551198aec35951608536b95462e7e0923c31f 100644 (file)
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -392,7 +392,7 @@ void gtk_ctree_node_set_row_data                 (GtkCTree     *ctree,
 void gtk_ctree_node_set_row_data_full            (GtkCTree     *ctree,
                                                  GtkCTreeNode *node,
                                                  gpointer      data,
-                                                 GtkDestroyNotify destroy);
+                                                 GDestroyNotify destroy);
 gpointer gtk_ctree_node_get_row_data             (GtkCTree     *ctree,
                                                  GtkCTreeNode *node);
 void gtk_ctree_node_moveto                       (GtkCTree     *ctree,

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 15a4bd3759c9856bb11bf5b6c02a88a4e8aae6ad..70c01a6223b32fb07b43df60429b60909a3b2781 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1482,7 +1482,7 @@ gtk_item_factory_popup (GtkItemFactory            *ifactory,
  * gtk_item_factory_popup_with_data:
  * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new())
  * @popup_data: data available for callbacks while the menu is posted
- * @destroy: a #GtkDestroyNotify function to be called on @popup_data when
+ * @destroy: a #GDestroyNotify function to be called on @popup_data when
  *  the menu is unposted
  * @x: the x position 
  * @y: the y position
@@ -1510,7 +1510,7 @@ gtk_item_factory_popup (GtkItemFactory            *ifactory,
 void
 gtk_item_factory_popup_with_data (GtkItemFactory       *ifactory,
                                  gpointer               popup_data,
-                                 GtkDestroyNotify       destroy,
+                                 GDestroyNotify         destroy,
                                  guint                  x,
                                  guint                  y,
                                  guint                  mouse_button,
@@ -1558,7 +1558,7 @@ gtk_item_factory_popup_with_data (GtkItemFactory  *ifactory,
  * @ifactory: a #GtkItemFactory
  * @func: the #GtkTranslateFunc function to be used to translate path elements 
  * @data: data to pass to @func and @notify
- * @notify: a #GtkDestroyNotify function to be called when @ifactory is 
+ * @notify: a #GDestroyNotify function to be called when @ifactory is 
  *   destroyed and when the translation function is changed again
  * 
  * Sets a function to be used for translating the path elements before they
@@ -1567,10 +1567,10 @@ gtk_item_factory_popup_with_data (GtkItemFactory        *ifactory,
  * Deprecated: 2.4: Use #GtkUIManager instead.
  */ 
 void
-gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
-                                    GtkTranslateFunc     func,
-                                    gpointer             data,
-                                    GtkDestroyNotify     notify)
+gtk_item_factory_set_translate_func (GtkItemFactory    *ifactory,
+                                    GtkTranslateFunc   func,
+                                    gpointer           data,
+                                    GDestroyNotify     notify)
 {
   g_return_if_fail (ifactory != NULL);
   

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index bd9332f5234a2378317155bd715942c350fd379b..0e71f4886adb0c88e961b50ee10783448decd518 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -73,7 +73,7 @@ struct _GtkItemFactory
 
   GtkTranslateFunc       translate_func;
   gpointer               translate_data;
-  GtkDestroyNotify       translate_notify;   
+  GDestroyNotify         translate_notify;
 };
 
 struct _GtkItemFactoryClass
@@ -184,7 +184,7 @@ void        gtk_item_factory_popup          (GtkItemFactory         *ifactory,
                                         guint32                 time_);
 void   gtk_item_factory_popup_with_data(GtkItemFactory         *ifactory,
                                         gpointer                popup_data,
-                                        GtkDestroyNotify        destroy,
+                                        GDestroyNotify          destroy,
                                         guint                   x,
                                         guint                   y,
                                         guint                   mouse_button,
@@ -194,7 +194,7 @@ gpointer gtk_item_factory_popup_data_from_widget (GtkWidget *widget);
 void   gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
                                            GtkTranslateFunc     func,
                                            gpointer             data,
-                                           GtkDestroyNotify     notify);
+                                           GDestroyNotify       notify);
 
 /* Compatibility functions for deprecated GtkMenuFactory code
  */

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index c960d8f203d9f7e010f0b4445ae4e536ff4f5b43..89d940edc237b60f36b7e660c1ba50367cd191fe 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -520,15 +520,15 @@ typedef struct _GtkWeakRef        GtkWeakRef;
 
 struct _GtkWeakRef
 {
-  GtkWeakRef      *next;
-  GtkDestroyNotify  notify;
-  gpointer          data;
+  GtkWeakRef    *next;
+  GDestroyNotify  notify;
+  gpointer        data;
 };
 
 void
-gtk_object_weakref (GtkObject        *object,
-                   GtkDestroyNotify  notify,
-                   gpointer          data)
+gtk_object_weakref (GtkObject      *object,
+                   GDestroyNotify  notify,
+                   gpointer        data)
 {
   GtkWeakRef *weak;
 
@@ -546,9 +546,9 @@ gtk_object_weakref (GtkObject        *object,
 }
 
 void
-gtk_object_weakunref (GtkObject        *object,
-                     GtkDestroyNotify  notify,
-                     gpointer          data)
+gtk_object_weakunref (GtkObject      *object,
+                     GDestroyNotify  notify,
+                     gpointer        data)
 {
   GtkWeakRef *weaks, *w, **wp;
 
@@ -664,10 +664,10 @@ gtk_object_set_data (GtkObject        *object,
 }
 
 void
-gtk_object_set_data_by_id_full (GtkObject        *object,
-                               GQuark            data_id,
-                               gpointer          data,
-                               GtkDestroyNotify  destroy)
+gtk_object_set_data_by_id_full (GtkObject      *object,
+                               GQuark          data_id,
+                               gpointer        data,
+                               GDestroyNotify  destroy)
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
 
@@ -675,10 +675,10 @@ gtk_object_set_data_by_id_full (GtkObject        *object,
 }
 
 void
-gtk_object_set_data_full (GtkObject        *object,
-                         const gchar      *key,
-                         gpointer          data,
-                         GtkDestroyNotify  destroy)
+gtk_object_set_data_full (GtkObject      *object,
+                         const gchar    *key,
+                         gpointer        data,
+                         GDestroyNotify  destroy)
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
   g_return_if_fail (key != NULL);

diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 39e808c4a7120111e6919f7bad75b9a2df975323..041d757e505498749194aee7145a43d42205ab90 100644 (file)
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -141,10 +141,10 @@ GtkObject*        gtk_object_new            (GtkType             type,
 GtkObject*     gtk_object_ref            (GtkObject          *object);
 void           gtk_object_unref          (GtkObject          *object);
 void gtk_object_weakref          (GtkObject        *object,
-                          GtkDestroyNotify  notify,
+                          GDestroyNotify    notify,
                           gpointer          data);
 void gtk_object_weakunref (GtkObject       *object,
-                          GtkDestroyNotify  notify,
+                          GDestroyNotify    notify,
                           gpointer          data);
 
 /* Set 'data' to the "object_data" field of the object. The
@@ -165,7 +165,7 @@ void         gtk_object_set_data         (GtkObject      *object,
 void    gtk_object_set_data_full    (GtkObject      *object,
                                      const gchar    *key,
                                      gpointer        data,
-                                     GtkDestroyNotify destroy);
+                                     GDestroyNotify  destroy);
 void    gtk_object_remove_data      (GtkObject      *object,
                                      const gchar    *key);
 gpointer gtk_object_get_data        (GtkObject      *object,
@@ -192,7 +192,7 @@ void gtk_object_set_data_by_id              (GtkObject       *object,
 void gtk_object_set_data_by_id_full    (GtkObject       *object,
                                         GQuark           data_id,
                                         gpointer         data,
-                                        GtkDestroyNotify destroy);
+                                        GDestroyNotify   destroy);
 gpointer gtk_object_get_data_by_id     (GtkObject       *object,
                                         GQuark           data_id);
 void  gtk_object_remove_data_by_id     (GtkObject       *object,

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 2132088b84b440a26cec2a2f87e09b3ac93d0f89..62398f000a2f34e045087ce8c82297afadc8cd3e 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -138,7 +138,7 @@ gtk_signal_connect_full (GtkObject           *object,
                         GtkSignalFunc        func,
                         GtkCallbackMarshal   unsupported,
                         gpointer             data,
-                        GtkDestroyNotify     destroy_func,
+                        GDestroyNotify       destroy_func,
                         gint                 object_signal,
                         gint                 after)
 {

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 7de9302bf1b29c831fef17885fd73c699216d74c..1a13ad16450a5d685e489104f5506e54a9125329 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -121,7 +121,7 @@ gulong      gtk_signal_connect_full                 (GtkObject          *object,
                                                 GtkSignalFunc       func,
                                                 GtkCallbackMarshal  unsupported,
                                                 gpointer            data,
-                                                GtkDestroyNotify    destroy_func,
+                                                GDestroyNotify      destroy_func,
                                                 gint                object_signal,
                                                 gint                after);
 void   gtk_signal_emitv                        (GtkObject          *object,